test merge no fast forward
